From: Jo-Philipp Wich <jo@mein.io>
Date: Mon, 20 Jun 2022 22:07:04 +0000 (+0200)
Subject: luci-proto-wireguard: gracefully deal with missing uci configs
X-Git-Url: http://git.openwrt.org/%22https:/collectd.org//%22/%22https:/collectd.org/%22?a=commitdiff_plain;h=bf5d9d4a0f056d75210f87390371827bfb1a9d3b;p=project%2Fluci.git

luci-proto-wireguard: gracefully deal with missing uci configs

The /etc/config/ddns in particular might not be present on the system,
don't fail if it is absent.

Fixes: #5838
Fixes: 9ba20645b0 ("luci-proto-wireguard: rewrite protocol handler")
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 340183786e5441197141efaf7d8cf0e682047bfe)
---

diff --git a/protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js b/protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js
index 6fb8b9a398..e2abd3b71d 100644
--- a/protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js
+++ b/protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js
@@ -686,8 +686,8 @@ return network.registerProtocol('wireguard', {
 			return Promise.all([
 				network.getWANNetworks(),
 				network.getWAN6Networks(),
-				uci.load('ddns'),
-				uci.load('system'),
+				L.resolveDefault(uci.load('ddns')),
+				L.resolveDefault(uci.load('system')),
 				parent.save(null, true)
 			]).then(function(data) {
 				var hostnames = [];